Draft 2 Different Change
Line 2

Line 4
Line 5 modified

Line containing a conflict
Final
